Cream of the Crop 26

home *** CD-ROM | disk | FTP | other *** search

/ Cream of the Crop 26 / Cream of the Crop 26.iso / windows / vmerg130.zip / README.TX_ / README.TX

Wrap

Text File | 1997-07-17 | 25KB | 645 lines

_______ ____|__ | (TM) --| | |------------------- | ____|__ | Association of | | |_| Shareware |__| o | Professionals -----| | |--------------------- |___|___| MEMBER ***************************************************************************** * This program is produced by a member of the Association of Shareware * * Professionals (ASP). ASP wants to make sure that the shareware principle * * works for you. If you are unable to resolve a shareware-related problem * * with an ASP member by contacting the member directly, ASP may be able to * * help. The ASP Ombudsman can help you resolve a dispute or problem with * * an ASP member, but does not provide technical support for members' * * products. Please write to the ASP Ombudsman at 545 Grover Road, * * Muskegon, MI 49442-9427 USA, FAX 616-788-2765 or send a CompuServe * * message via CompuServe Mail to ASP Ombudsman 70007,3536. * * ***************************************************************************** VMERGE Version 1.30 Visual Diff / Merge Program Table of Contents: 1. Overview 2. License Agreement 2.1 TRIAL USE LICENSE 2.2 LIMITED DISTRIBUTION LICENSE 2.3 WARRANTY 2.4 What is the difference between the Registered and Unregistered versions? 3. Registration information 4. Using VMERGE 4.1 Merging files 4.2 Merging directories. 4.3 Menus 4.4 Keyboard shortcuts 4.5 Command-line options 4.6 Customizing VMERGE 5. Technical support. 6. Requirements 7. Known Bugs and Features 8. What is new in this version(compared with v1.27) 9. Contact info 1. Overview =========== VMERGE is an easy to use program designed to help people in merging files. Those who have tried once to combine two similar versions of a program know how difficult it is. There are always some lines that get forgotten or misplaced. There are some utilities for comparing files and producing a list of differences between them, but these programs will often scarcely help, because one should still perform merging manually, cutting lines alternately from the files. On the other hand, there are programs that can create a third file based on two versions, but they are either primitive or too complex for everyday use. VMERGE makes file merging much easier by letting you to choose between the differing portions by a single mouse click. Its intuitive interface and other features allow you to minimize manual postprocessing thus saving your time. The program comes in two versions - 16 bit and 32 bit. The former is limited to files shorter than 64 K, while the latter has no size limits, supports long file names and may be run on Windows NT, Windows 95 or Windows 3.1 with Win32s installed (Win32s is freely distributed by Microsoft and may be downloaded from the following address: ftp://ftp.microsoft.com/Softlib/MSLFILES/PW1118.EXE). 2. License Agreement ======================= 2.1 TRIAL USE LICENSE VMERGE is NOT a public domain program. It is copyrighted by Victor Golosovker. This software and accompanying documentation are protected by United States copyright law and also by international treaty provisions. Victor Golosovker grants you a limited license to use this software for evaluation purposes for a period not to exceed 100 program executions. If you continue using this software after the evaluation period, you MUST make a registration payment to Victor Golosovker. You may not use, copy, rent, lease, sell, modify, decompile, disassemble, otherwise reverse engineer, or transfer the licensed program except as provided in this agreement. Any such unauthorized use shall result in immediate and automatic termination of this license. All rights not expressly granted here are reserved to Victor Golosovker. 2.2 LIMITED DISTRIBUTION LICENSE Permission is granted to individuals charging no fees, and to BBSs, User Groups, Mail-Order Disk Vendors, CD-ROM publishers, and BBS File-Distribution Networks regardless of fees, to distribute VMERGE , provided they convey a complete and unaltered copy of the shareware version of this product, and provided they claim no ownership of these products. Distribution by other channels, and distribution of modified versions, are also allowed, but only under the terms of the attached VMERGE data record, which is hereby incorporated by reference. Any distribution satisfying all the distribution requirements expressed in that data record is hereby authorized. Permission to distribute the VMerge package is not transferable, assignable, saleable, or franchisable. Each vendor wishing to distribute the package must independently satisfy the terms of this limited distribution license. U.S. Government Information: Use, duplication, or disclosure by the U.S. Government of the computer software and documentation in this package shall be subject to the restricted rights applicable to commercial computer software as set forth in subdivision (b)(3)(ii) of the Rights in Technical Data and Computer Software clause at 252.227-7013 (DFARS 52.227-7013). The Contractor/manufacturer is Victor Golosovker, Havacelet 16/10, Nesher, Israel 36731. Victor Golosovker may revoke any permissions granted here, by notifying you in writing. All rights not expressly granted here are reserved to Victor Golosovker. 2.3 LIMITED WARRANTY THIS SOFTWARE AND MANUAL ARE PROVIDED FOR EVALUATION ONLY, ON AN "AS IS" BASIS. THE AUTHOR DISCLAIMS ALL WARRANTIES RELATING TO THIS SOFTWARE, WHETHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. NEITHER THE AUTHOR NOR ANYONE ELSE WHO HAS BEEN INVOLVED IN THE CREATION, PRODUCTION, OR DELIVERY OF THIS SOFTWARE SHALL BE LIABLE FOR ANY INDIRECT, CONSEQUENTIAL, OR INCIDENTAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE SUCH SOFTWARE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES OR CLAIMS. THE PERSON USING THE SOFTWARE BEARS ALL RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. This agreement shall be governed by the laws of the State of Israel and shall inure to the benefit of the author and any successors, administrators, heirs and assigns. Any action or proceeding brought by either party against the other arising out of or related to this agreement shall be brought only in FEDERAL COURT of competent jurisdiction located in Israel. The parties hereby consent to in personam jurisdiction of said courts. 2.4 What is the difference between the Registered and Unregistered versions? Functionally there is no difference - it's the same program with the same features. Just one thing - you can't use the unregistered version forever. The evaluation version allows you to execute the program only 100 times. After that you will not be able to use the software. If you like the program and want to continue using it you are required to register(see registration section below). All registered users will receive future versions of VMerge upon their release without upgrade fees. 3. Registration information ============================= There are three types of licences: single-user, site and world-wide. Single user licence limits the usage of the program to a single computer at any given time. Site licenses cover a single organization for an area of up to one hundred miles (160 km) in radius. A world-wide license covers everyone in a single organization. Please observe and verify the total of your payment as you select licenses. The license fee may be paid by check, money order, cash, VISA, MasterCard, American Express, Discover, Diners Club or First Virtual. There are 4 ways of registering VMERGE: 1) Run REGISTER.EXE provided with the program. If you did not receive it in your package please contact the author. REGISTER.EXE will help you to fill the order form which should be faxed or e-mailed to Kagi Shareware. REGISTER.EXE comes with online help explaining the registration procedure in details. If you have any problem with registering the product don't hesitate to contact Kagi: via Mail: admin@kagi.com via WWW: www.kagi.com via Fax: +1 (510) 652-6589 via Phone: +1 (510) 601-5244 via Postal Mail: Kagi Shareware 1442-A Walnut Street #392 Berkeley California 94709-1405 USA Note that Kagi is only a processing service so any questions related to the product itself should be directed to the author. 2) You can register VMERGE using Kagi's online order processing system. Just browse to http://order.kagi.com/cgi-bin/register1.cgi?VI or https://order.kagi.com/cgi-bin/register1.cgi?VI (secure) and fill the order. 3) You may register via telephone. Call these numbers and place your order: +1 (510) 658-5244 +1 (510) 601-5244 NOTE: you will be charged additional 5$ if you order by phone. 4) You may send the payment directly to the author(see the form below). In this case, however, you may pay only by check. The program may be delivered either by e-mail or by snail mail. In the latter case you should add a postal fee. Please check your delivery address. IMPORTANT: As a registered user you will receive the latest version of the program and future releases. The following information regards only users wishing to register directly with the author. Please fill the form below, attach a check in US dollars payable to: Olga or Victor Golosovker and send it to the following address: Mr. V. Golosovker, 16/10 Havacelet, Nesher, Israel 36731. ======================= ORDER FORM ========================== Name: ___________________________________________________ Company: ___________________________________________________ Address: ___________________________________________________ ___________________________________________________ Tel/Fax: ___________________________________________________ Please accept this registration fee for VMERGE v1.30. Please send me (check the box) : [ ] Diskette with the program by mail. [ ] Please, send me 3 1/2" diskette [ ] Please, send me 5 1/4" diskette [ ] The program by e-mail (address attached). Internet E-mail: ___________________________________________ ________________________________________ _______________ SIGNED DATE Registration fee: Single-user licence : $ 25.00 _____ Site licence : $ 200.00 _____ World-wide licence : $ 2000.00 _____ Postal fee (if applicable): $10 _____ TOTAL $ _______ ======================= END ORDER FORM ========================== 4. Using VMERGE ================ 4.1 Merging files ----------------- 1) Load files to be merged into the file panes. This can be done by either selecting "File 1", "File 2" items in the File menu or by pressing Ctrl+F1 / Ctrl+F2 or by dragging files from File Manager. You can toggle the line numbers display mode by turning "Line Numbers" option on. 2) Select Diff from File menu. The program will color the differing sections of both files in two colors - green and yellow. Yellow lines are blank lines that should be added to the file to match a segment in the second file. Green color means that the colored lines differ from the related section in the other file or are missing at all (in this case lines in the second file are yellow). Vmerge shows you the relative positions of the differing segments on the Position Bar (two columns around the vertical scrollbar in the center). Each mark in the Position Bar is associated with a segment so you can quickly display the segment by positioning scrollbar against the mark. 3) For each of the differing segments you should select one of the files by clicking left mouse button over the colored text. Selected segments will change their color to blue. If the Auto-walk mode is on the program will jump to the next segment as soon as you resolve the current one. 4) Select "Write" from the File menu and choose the output file name. The results will be written to the file. NOTE : If the file already exists it will be overridden. The original file will be saved under the name <name>.bak to prevent data loss. NOTE : Although VMERGE preserves the older version of output file you are strongly advised to create backups for files you intend to change. 4.2 Merging directories. ------------------------ Select "Compare Directories" in File menu. You will be prompted for first, second and target directories. Vmerge will compare the files in the first directory against the second directory. If the same version of a file is present in both places or file with a certain name is found only in one directory, the program will copy it to the destination directory. If two files with the same name but different contents are present in compared directories, they will be displayed side by side just as if you were comparing files in normal mode. The only difference is the changed File menu. To proceed without merging the current file you can select Skip in the File menu. To cancel comparing the directories you should choose Cancel in the File menu. To merge the current file you should resolve all the differences and write the result to the disk (see Merging Files section). After saving the merged version Vmerge will proceed to the next file. By default VMERGE compares everything in the specified directories. However you can customize this behavior by specifying exclude and include filters. When you add an exclude filter all files matching this filter will be ignored. If you specify at least one include filter, only the files matching include filters will be compared. If a file matches both exclude filters and include filters it will be ignored. NOTE : Although VMERGE preserves the older version of output file you are strongly advised to create backups for directories you intend to change. 4.3 Menus ---------- VMERGE main window contains two file panes and menu. There are 3 items in the menu: File, Search, Select, Options and About. File menu (file comparison mode) entries are: File 1 - for choosing the first file name File 2 - for choosing the second file name Compare dirs - compares two directories Compare files - compares two files Print - prints the merged version Write - writes the result Quit - just this. File menu (directory comparison mode) entries are: Skip - skip current file and continue comparing Cancel - stops directory comparison and returns to the normal mode Write - writes the results and proceeds to the next file Print - prints the combined version Quit - just this. Search menu contains items: Next - go to the next differing segment Previous - go to the previous differing segment Next Unresolved - go to the next unresolved segment Previous Unresolved - go to the previous unresolved segment First - go to the first differing segment Last - go to the last differing segment Beginning - go to the first line End - go to the last line Select menu: From Left - chooses all the unresolved differences from the left file From Right - unresolved segments are taken from the right file Unselect All - dismiss all the choices made so far Options opens a submenu with the following items: General - general options Fonts - customize text and title fonts File filtering - customize file extensions File types - customize filters that appear in the file open box Directory compare - customize include and exclude filters for directory comparison. There is also a quick menu available in the file panes. It's opened by pressing the right mouse button. The menu contains the following items: Next Previous Next Unresolved Previous Unresolved Beginning End From Left From Right Unselect All These entries have the same meaning as those in main menu. 4.4 Keyboard shortcuts ---------------------- Ctrl+F1 - load left file Ctrl+F2 - load right file Ctrl+0 - compare directories Ctrl+D - display files differences Ctrl+W - write out the results. Ctrl+N - Next differing section Ctrl+P - Previous differing section Shift+N - Next differing section Shift+P - Previous differing section Ctrl+F - Font selection box Ctrl+T - Tab size selection PgDown - Next screen PgUp - Previous screen Ctrl+PgDown - Jump to the file end Ctrl+PgUp - Jump to the file beginning Alt+S - Skip to the next file (directory comparison) Alt+C - Cancel directory comparison. 4.5 Command-line options ------------------------ -d1 <dir name> Starting directory for the left file open dialog. Overrides INI file settings. -d2 <dir name> Starting directory for the right file open dialog. Overrides INI file settings. -f1 <file name> Loads file <file name> into the left window. If the file name does not contain the full path it would be first searched in the current directory, then in the directory specified by -d1 option (or in the directory specified in the INI file if -d1 option is not present). -f2 <file name> Loads file <file name> into the right window. If the file name does not contain the full path it would be first searched in the current directory, then in the directory specified by -d2 option (or in the directory specified in the INI file if -d2 option is not present). If both -f1 and -f2 are specified the files will be compared automatically right after being loaded. -outf <file name> Output results to file <file name> -outd <dir name> Use <dir name> as default output directory name Example: vmerge -d1 c:\temp -f1 file1.txt -f2 c:\misc\file2.txt Loads files c:\temp\file1.txt and c:\misc\file2.txt and compares them. 4.6 Customizing VMERGE ---------------------- a) General options. General options dialog includes the following elements: Tab size - the number of spaces represented by tab character. This attribute influences only the display. When you write an output files VMERGE will preserve real tab characters. Context lines - the number of context lines to display before the differing section when browsing to next or previous section. if this field is zero, VMERGE will display the section right at the top. Display line numbers - for each line display its number in the original file. Synchronized scrolling - Synchronizes horizontal scrolling in both file panes. Auto-Walk - If the Auto-walk mode is on the program will jump to the next segment as soon as you resolve the current one. Compress spaces - instructs to consider a sequence of white spaces as a single space. Unix file format - The output file will be written in the UNIX file format(each line is terminated only by end-of-line character) You can access these options by choosing Options->General menu. b) Font selection You can separately select fonts for file panes and for file name labels by selecting Options->Fonts->Text or Options->Fonts->Title menus. c) Customizing Open File dialog You can add your own File Types to Open file dialog. Select Options->File filtering->File types and add file filter and description of the type. You you want to add a multiple wildcards filter you should separate wildcards with semicolon. For example: File type: *.c;*.h Description: C files To delete a file type open File Types dialog, select the type from the list and press Delete button. d) Customizing directory comparison By default Directory Compare algorithm merges everything in the source directories. In some cases, however you may prefer to ignore some types of files (like *.bak, for example) or compare only certain types (only *.c, for instance). You can do this by specifying Include or Exclude filters for Directory compare. If you specify at least one include filter than only files matching some pattern in the Include box will be compared. Note that any file matching some pattern in the exclude box will be ignored, even if it matches Include filters. 5. Technical support. ==================== Technical support will be available via mail or e-mail for registered users only. User who submits a bug report(including all needed accompanying files and procedures to reproduce the bug) during the first 90 days after his registration will receive a satisfying solution to the problem or full refund of the registration fee. Beyond the 90 days period the author is not obligated to refund the user, though the best efforts will be made to fix reported bugs. To get the support please contact the author: By e-mail: victor@harmonic.co.il or victor@kagi.com By mail: Olga or Victor Golosovker, 16/10 Havacelet, Nesher, Israel 36731. You are invited to visit product's homepage: http://members.tripod.com/~olgac/products.html 6. Requirements =============== 16 bit version: 1) 80286+ Processor 2) Windows(3.1, NT or 95) 32 bit version: 1) 80386+ Processor 2) Windows NT, Windows 95 or Windows 3.1 + Win32s 7. Known Bugs and Features ========================== * 16 bit VMERGE is not guaranteed to work correctly with files larger than 64k. * The program may fail on binary files, files with extremely long lines or certain text processor formats such as Write or Word. * Evaluation version is limited to 100 executions. 8. What is new in this version(compared with v1.27) ================================================== * Recursive directory comparison feature added * Jump to the next/previous unresolved segment * Displaying differing segments in their context * Synchronized horizontal scrolling * Unix output file format * Customization of file types in the "Open file" dialog * Include / Exclude filters for directory comparison. * Last run position and size are remembered * Drag and drop support added * Toolbar added in 32 bit version * Cancel directory comparison feature added 9. Contact Info ================ stdmail: Olga and Victor Golosovker, 16/10 Havacelet, Nesher, Israel, 36731 e-mail: victor@kagi.com victor@harmonic.co.il WWW: http://members.tripod.com/~olgac/products.html Tel.: 972-4-8326127 The author will be very thankful for any comments and bug reports.